From: Stefano Stabellini Date: Thu, 19 Nov 2020 19:07:46 +0000 (+0000) Subject: xen/arm: mm: Remove special case for CPU0 in dump_hyp_walk() X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~1054 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=d90390d031554337f4fc9c98045d5a9ef71e6f23;p=xen.git xen/arm: mm: Remove special case for CPU0 in dump_hyp_walk() There is no need to have a special case for CPU0 when converting the page-table virtual address into a physical address. The helper virt_to_maddr() is able to translate any address as long as the root page-tables is mapped in the virtual address. This is the case for all the CPUs at the moment. So use the same BUG_ON() regardless the CPU. Signed-off-by: Stefano Stabellini [julien: Rework the commit message] Signed-off-by: Julien Grall Reviewed-by: Bertrand Marquis --- diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 9c4b26bf07..4dd886f7c8 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -284,10 +284,7 @@ void dump_hyp_walk(vaddr_t addr) "on CPU%d via TTBR 0x%016"PRIx64"\n", addr, smp_processor_id(), ttbr); - if ( smp_processor_id() == 0 ) - BUG_ON( (lpae_t *)(unsigned long)(ttbr - phys_offset) != pgtable ); - else - BUG_ON( virt_to_maddr(pgtable) != ttbr ); + BUG_ON( virt_to_maddr(pgtable) != ttbr ); dump_pt_walk(ttbr, addr, HYP_PT_ROOT_LEVEL, 1); }